Adding improvements to variables and base
Updating base

Merge branch 'master' of https://github.com/tbazko/project-base