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