Merge pull request #2 from yagi2/feature/yagi2

Feature/yagi2
Merge remote-tracking branch 'origin/develop' into feature/yagi2