updates
Merge branch 'dev_ubuntu'