dev #2

Open
tangwy wants to merge 10 commits from dev into master