Cleaned branch for Android implementation.