Feature/bugfix 12