refactor, documentation additions
Merge branch 'develop'