Implement SEP0029

[fracek]

Same as #241 , trying to fix coveralls being stuck.

Fixes #240

Types of changes

• [ ] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [ ] Breaking change (fix or feature that would cause existing functionality to change)
• [ ] I have read the CONTRIBUTING document.
• [ ] My code follows the code style of this project.
• [ ] My change requires a change to the documentation.
• [ ] I have updated the documentation accordingly.
• [ ] I have added tests to cover my changes.
• [ ] All new and existing tests passed.

[coveralls]

Coverage increased (+0.02%) to 85.453% when pulling 562c231abf72c26d3d0348796390bd85b712e473 on sep-29 into 7e19bed2d3217ca4b436d4eb6fa35f028e69be0b on master.