Release 0.1.5
Merge remote-tracking branch 'origin/development' into refactoringtrees
Adding new classes as per diagram. More work on refactoring