Added support for VS2012/VS2013
Merge remote-tracking branch 'origin/master'