added more option, added vagrant testing