Merge pull request #1 from nbogol/feature/f1

Feature/f1
Merge remote-tracking branch 'upstrream/master'