Updated for more functionality
Merge branch 'master' of https://github.com/fauxtrot/angular-ts-proto.git
New functionality