Merge pull request #2 from ellemenno/master

further prep for 1.0.0