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