Before convert to android studio
Merge rfrost