merge issue#2