Merge pull request #43 from eile/1.0

The 'easy' part of #40
Merge pull request #46 from eile/1.0

1.0.1 release