Adding support for VS2013
Merge with master