Merge pull request #1 from hashimotop/develop

yes
add feature2
Merge pull request #2 from hashimotop/feature/feature-2

Feature/feature 2