1.0 release
Merge pull request #5 from mmell/master

1.0 release