Fix bug #1001536
Merge pull request #149 from almossawi/master

Fix bug #1001536