Master

After talking to Olga, Eric M, and Sam, current master versions (iOS 2.0.2/Android 2.1.4) have been fully tested.