Merge pull request #18 from PAU-Projects/master

update