commit 2
commit 3
commit 5
commit 7
Merge pull request #1 from yzhang2013/feature

Feature merge into develop