Closes #8.
Merge branch 'feature/8' into development