Improve code,
Add docs
Merge branch '109' into angular-terms