Merge pull request #2 from PeterMinin/master

Fix expanded text showing "Notable"; disable "expand buttons" setting for Android 4.0-; refactoring