premier commit
jp
Merge pull request #5 from titi60/master

premier commit zhang
Merge pull request #6 from john2512/master

jp