Merge pull request #21 from Dzeta/master_update

Master update
Remove development console
Merge branch 'master' into master_update