fixed last remaining issues before v2.1.0
Merge pull request #97 from coldnebo/master

fixed last remaining issues before v2.1.0