Merge branch 'dev' of https://github.com/xiaolin1579/miningcore into dev

Merge branch 'dev' of https://github.com/xiaolin1579/miningcore into dev #301