Merge pull request #36 from andreqi/master

update jc
Merge pull request #37 from andreqi/jc

Merge pull request #36 from andreqi/master