Merge pull request #13 from 0rca/master

Merge other devs' additions and clean up a bit