Commit to make sure we both have same code.
Merge remote-tracking branch 'origin/master'
Fixed mining sort of