VS2013 Compatible

This branch works with VS2013
Merge remote-tracking branch 'origin/VS2013'