Merge pull request #1 from scsewell/master

Added various classes and cool stuff
Merge remote-tracking branch 'upstream/master'