Hydro devel

Added fixes to support Microsoft Visual Studio prior 2010