Created by: xijo
This is a small PR as followup on #431 (closed) - should save some folks some trouble :)