Merge pull request #3 from SchizoDuckie/angular

merge for latest updates