Big updates!
Merge pull request #22 from KanThorne/master

Big updates!