Fix/issue 71