1.0
Merge pull request #16 from AndrewJNaranjo/master

1.0