Fixed issues #253 and #249 for VS 2013 and 2012.
Merge pull request #572 from blackberry/next-253

Fixed issues #253 and #249 for VS 2013 and 2012.