Issue 235

After adding a check to match the `Device_Type` with `isMobileDevice` and `isTablet` and a lot of fixes Issue #235 should be fixed now.