JakeSteam Merge branch 'androidwave'