merge mobile viewport - issue #13

This should fix issue #13