Bug fixes
Merge pull request #34 from mshamash/master

Bug fixes