Fix for viewable_on_device, and updated setup.py..