Feature/bugfix #003

Have a new feature here 003