last minute hacks
Merge branch 'master' of https://github.com/jrouly/srct-vahack