Revert to dc0b488
Merge pull request #117 from addshore/revert

Revert to dc0b488