merging ubuntu user into master #10

Closed dmalan closed 6 years ago