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