merge issue#14, #16