Merge pull request #12 from triangular/devel

Devel: More angular in angular