More Bug Fixes
More refactoring
Code formatter
Updated Documentation
Added feature #16
Merge branch 'develop'