Manual merge PR#97 "Pullbug" from Profakos/PULLBUG

Something prevented me from doing this automatically, my apologies.
Signed-off-by: SuperSayu <SuperSayu@GMail.com>