Implements #8
Merge branch 'feature/8' into develop