clean it up
Merge branch 'master' of github.com:kalmbach/Common