Add tests and doc info
Merge branch 'develop'