Change configuration for more flexibility
Add Vagrant for easy test