Preparations for 1.0
Merge pull request #22 from egeste/master

Preparations for 1.0