for PhpStorm user
Merge pull request #48 from tomotomo/master

for PhpStorm user
merge master