merging issue-10 branch