Small source code tweaks
Merge branch 'master' of ssh://github.com/benjisimon/code