Reverted pull #117 from Likaos/patch-1