Merge pull request #15 from andreqi/master

update jc