Merge pull request #41 from andreqi/master

update jc