Bug fix for #57
Merge pull request #58 from tallandroid/master

Bug fix for #57