Fixes for ipad issue
Merge pull request #131 from yogeshchaugule/develop

Fixes for ipad issue