Fixed issue #124
Merge pull request #126 from SamMousa/master

Fixed issue #124