initial Contax commit
Merge branch 'master' of https://github.com/mrjferg/contax