having fun with logic and bug fixes
Merge branch 'master' of https://github.com/Avnerus/pulse-midburn