Merge pull request #28 from mixalturek/master

Bugfixes