Merged
Merge remote-tracking branch 'refs/remotes/mineforeman/master'
Merge pull request #39 from thgh/master

Essential part of miner.conf editor