TEST
Merge branch 'android'
test reset to master
Merge branch 'master' into android
Switching to master
Added Sin-1