Fix for issue #40.
Tablet and Mobile Version TBD.