Merge pull request #19 from jdhenke/fix-rebase

Fix Rebase
Merge branch 'master' into latency-testing