Progress Issue#25
Merge branch 'feature/Issue#25v2' into develop