Merge pull request #5 from AthanasiosPavlou/ubuntu

Ubuntu
bbbb
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into ubuntu

Conflicts:
	README.md