Merge pull request #3 from ellemenno/master

closing in on 1.0.0