Better documentation
Merge branch 'angular'
Working render, need more tests