Feature/issues/15