Merge pull request #6 from narrowspark/develop

Develop
console fixes
cs fixes
Merge pull request #48 from prisis/console

Console