Closes #93 jpm is too fast
Merge pull request #110 from erikvold/93

Closes #93 jpm is too fast r=@jsantell