Merge pull request #236 from micmac1/gsmlib-master