Merge pull request #1 from Pascalmh/master

update from base