Shane's quick fixes to some bugs
Merge pull request #1 from mallman777/feature/pulse_counting

Shane's quick fixes to some bugs