a
changes from linux
new function
aaa
Merge branch 'master' into dev