Implemented additions in MOBILE-2155.
Merge pull request #24 from ldjagger/master

Implemented additions in MOBILE-2155.