Smaller changes + Pulse shape comparison
Merge branch 'master' of https://github.com/run1c/Master