Fix/issue 28