Closed mherchel closed 8 years ago
Resolves #51
This is ready
@mherchel merge conflict
This should resolve the merge conflict.
I trumped this with #73 mainly because I didn't see it before.
Resolves #51