"reworking 11"
changes
Merge pull request #1 from timborrego/feature/do_some_work

Feature/do some work