Fixes/issue 7