Refactoring
Progress Issue#26
Merge branch 'feature/Issue#26' into develop