Merge pull request #14 from ChrisBoesch/master

update
ng-init update #2
Merge pull request #299 from LI-HE/master

ng-init update #2