Updates for Version 3.5 - VS2013