chore (merge): https://github.com/pardom/ActiveAndroid/pull/226
chore (merge): https://github.com/pardom/ActiveAndroid/pull/230