merging issue-13 branch