cleanup
Merge branch 'feature/issue/#14' into develop