Minor configuration changes.
Merge branch 'master' of https://github.com/BartoszJanota/marims-android-lib