Proper monkey patching

+ one if/else simplified
s/sys/util/
v1.0.4