Update base
Merge pull request #1112 from NiLuJe/master

Update base