MR !50 (merged) merged into the wrong branch. This MR merges the changes into the master branch.
Closes #47 (closed)
\approve @laurens @shinde @tara