Merge pull request #1 from blackberry/master