Cleanup and Titlefixes
Merge pull request #75 from lolly/master

Cleanup and Titlefixes