1.0

upload
Merge pull request #28 from AndrewJNaranjo/master

1.0