commit 1 and 2

commit 2
Merge pull request #1 from JeffreyChiang/develop

commit 1 and 2