Issue #36 fixed

Thanks to @m-hanes @wolfmc3 @maxwaaaa @softsolutions @techjp