Some things I missed last time
Merge pull request #4 from mysteriosum/master

dfbd