More final little changes
Merge branch 'master' of https://github.com/ksunden/22