Fixed issues:
#313
#329
Merge pull request #340 from blackberry/next-313

Fixed issues: