Version 2.0.2 Bugfix 1

Fix crash on pre-4.1 devices
Merge remote-tracking branch 'origin/dev'