Feature/bugfix #002