Merge pull request #42 from quidryan/master

Some cleanup