Merge pull request #8 from andreqi/master

update dev
Merge pull request #9 from andreqi/jc

Merge pull request #8 from andreqi/master