Added some stuff, VS side.
Merge branch '201410101401'