/props @pbearne
Closes #64