Merge pull request #41 from systopia/master

Various fixes for version 0.3