Bug fixes.
Merge pull request #56 from jzvelc/master

Bug fixes.