updated version
Merge pull request #54 from paulchong/newbranch_3

updated version