fixes #69
Merge branch 'mobilelayout' into dev