First commit - functional with console
Merge branch 'master' of https://github.com/Vardarac/Pillar