cleanup
Merge branch 'master' of https://github.com/rothlmar/rothlmar.github.com