Patch for #53, not sure it's okay for sbt
Closes #53, hopefully without breaking others