and though bugs are the bane of my existence, rest assured the wretched thing will get the best of care here
Created by: gorillainduction
Rebased original pr #427 so that it can be merged to the release branch
