Updated for VS2013, fixes to ZOC