Cleaning up
Merge pull request #2 from 007au/master

Cleaning up