Fixed issue #20
Merge pull request #192 from blackberry/next-20

Fixed issue #20