Changed super to _super to support Android 2.3
Merge branch 'master' into develop