The best of the forks

#121 prompted me to create this overdue PR. See explanation there.
Thanks @iandunn 
I would rather merge this an improve later, rather than wait until it is stable.