Fixed #171.
Merge pull request #172 from frmwrk123/fix/mobileOptimization

Fixed #171.