Fixes #113 . Might be a more elegant way to do this? But for now this makes everything back-compatible.
@avallier Are you happy with this solution?