Nice and clean
Merge pull request #1 from harukizaemon/master

Just a general tidy and clean