Bug fixes
Merge pull request #31 from mshamash/master

Bug fixes