Fix
Merge branch 'master' into fix

Conflicts:
	Vagrantfile
Merge pull request #7 from hiroraba/fix

Fix