Merge branch 'master' of git@jeff.tk:trinary-code