Bug fixes
Merge pull request #43 from mshamash/master

Bug fixes