Fix 19

Update to #21 

This one might be good to go. Any testers? :+1: