Little bit of tweaking.
Merge branch 'master' of https://github.com/servc/con