Merge branch 'master' of github.com:slush0/stratum-mining