Merge pull request #624 from micmac1/sng148