Feature/issue 125

Fixes #125