Merge pull request #127 from jkingsbery/master

Clean up after #122
Began adding type information.