Merge pull request #4 from alexfupp/master

Further cleanup