Merge pull request #13 from ChrisBoesch/master

update
ng-init change #1
Merge pull request #296 from LI-HE/master

ng-init change #1