Bug fixes.
Merge pull request #24 from mshamash/master

Bug fixes.