Merge pull request #1 from jamesjin/init

A pull request
commit1
commit2