Bug fixes
Merge pull request #82 from mshamash/master

Bug fixes