jamesh1999/YRS-Thoth — pull request #13 by yrs-Nathan (2014-08-06 19:14:29+00:00)
Title: Merge changes to master

Check if develop still works so I can work on merging.