Merge pull request #36 from andreqi/master

update jc