Fix typo
Fixed the const issue
updated to vs2012
Merge remote-tracking branch 'upstream/master'