Fixed issue #434 for both VS 2010 and 2012
Merge pull request #439 from blackberry/next_434

Fixed issue #434 for both VS 2010 and 2012