documentation/testing/refactoring
Merge origin/master