init merge
merge with svn
Merge pull request #1 from willchenhb/master

merge with SVN