Fix/issue 11