Bug fixes
Merge pull request #41 from mshamash/master

Bug fixes