some minor bugfixes
Merge pull request #10 from wick-ed/master

reviewed diff and tested locally with 0.6.0