3
Merge pull request #1 from kimdh/fromubuntu

3
Merge remote-tracking branch 'origin/master' into fromubuntu