Fixed issue #304 for VS2012
Merge pull request #326 from blackberry/next-304-VS2012

Fixed issue #304 for VS2012