for code review
Merge branch 'master' of github.com:wija/scratchpad