V0.1.6: some changes done