Feature/issues/27