version 2
Merge pull request #1 from jaclin/master

version 2