Some small changes, still V1.0.4 :: To lazy to change :)