Fixes #83 for jelly bean and higher
Merge remote-tracking branch 'origin/master'