Not sure if this should be done but making the MR was almost as easy as proposing it.
Closes #45 (closed)