Refactoring to support simpler documentation
Merge remote-tracking branch 'origin/master'