Adding Venturestar
Merge remote-tracking branch 'zordey/upstream'