Merge remote-tracking branch 'upstream/master'
merging test
make corrected
Merge pull request #7 from HugoMichi/master

make corrected