Updated to work on tablets
Merge pull request #36 from narner/master

Updated to work on tablets