Added contributor credit
Merge remote-tracking branch 'origin/develop' into develop
Minor refactoring of test code
Merge branch 'develop' into refactoring