commit-3-15-done
Merge pull request #14 from bxl1989/master

pull 3-15 done