Merge branch 'release/v0.6.0' into develop
add ngdocs support
Merge pull request #17 from csharon/develop

Merge branch 'release/v0.6.0' into develop