Added collision detection code and improved debug interface
Merge branch 'master' of github.com:apohl79/energymon