Merge pull request #1 from AthanasiosPavlou/ubuntu

Ubuntu
Merge pull request #2 from AthanasiosPavlou/ubuntu

commit-again
Merge remote-tracking branch 'origin' into ubuntu