improved and fixed for vagrant 1.1+