Attempting to merge from this commit: https://github.com/simplecrypto/powerpool/commit/683c4265b421182b740472a8044dc9edfae36a0e#diff-995ff19087adf7c60ee7f0b2dbc17f37R26