re-commit.
Merge branch 'master' of github.com:solidhex/solidhex