bvc
Merge branch 'master' into ubuntu

Conflicts:
	README.md
Merge pull request #5 from AthanasiosPavlou/ubuntu

Ubuntu