Fix #91
Merge pull request #92 from mobiware/master

Fix #91