Merge issue#38 to dev

completed issue#38