WiP
Merge branch 'master' into coveralls
WiP