Merging projects

This update merges Karen’s Android project and some improvements of
mine into the iOS project.