Mobile fixes for issues #46 and #47.
Merge remote-tracking branch 'upstream/master'
Merge pull request #60 from cmgiven/master

Mobile fixes for issues #46 and #47.