Bug fix.
Merge pull request #102 from mshamash/master

Bug fix.