Added compatibility with the android/amarino program