added note about ubuntu
Merge branch 'ubuntu'