Converted to Android-Studio project