Merge pull request #8 from andreqi/master

update dev