Further dev.
Merge branch 'master' of github.com:petertr/sandbox