Added mobile compatibility
Merge