Feature/issues/9