Merge Fix/issue 89