Merge pull request #94 from amirnissim/master

Bugfixes