merge siadu(soleh) into siadu(master) ver 1.0