Improved Basefunction
Merge branch 'master' of https://github.com/SlowCheetah/wascooles