Merge pull request #15 from andreqi/master

update jc
Merge pull request #17 from andreqi/jc

Merge pull request #15 from andreqi/master