From midburn
Merge branch 'master' of https://github.com/Avnerus/pulse-midburn