minor fixes
Merge branch 'master' of https://github.com/loersch/loersch.github.com