Merge pull request #2 from nbogol/feature/f1

Feature/f1