Merge pull request #1 from staticsafe/testing

Merge changes from testing branch to master, this has been long overdue.
Merge pull request #3 from staticsafe/master

General cleanup