Co-authored-by: Davis Namsons davisnamsons@gmail.com Due to stalled activity in #243, I took liberty and completed the change requests from #243 (comment) Due to messy merge conflicts, I decided to...