Done!
Merge pull request #79 from EatonZ/master

Done!