ready for starting v0.2
Merge pull request #19 from wscherphof/#17->

ready for starting v0.2