Added position marker to the waveform
Removed missed debugging output.
Merge remote-tracking branch 'origin/master' into gh-pages