applied toms fixes to visual studio buildablilty
Merge branch 'ekfVS'