Merge branch 'master' of github.com:chekunkov/egonomist