Fixes/issue 11