godiard Merge pull request #1 from SAMdroid-apps/patch-1