updated branch yanniks/android