merge admin module. fix issue #10