Merge pull request #1 from mikemoraned/master

Master
Merge pull request #2 from mikemoraned/offsets

Merge pull request #1 from mikemoraned/master