1.0
Merge pull request #2 from craigspaeth/master

1.0