Fixed issue #15
Merge pull request #174 from blackberry/next-15

Fixed issue #15