Fix/issue 106