use skalnik's vroom
Merge remote-tracking branch 'upstream/master'