Fixes/issue 10