This should bring it up to speed.
Merge pull request #22 from lee-leonardo/master

This should bring it up to speed.