Merge remote-tracking branch 'origin/master'
[master]

- Fixed some bugs
	modified:   Ubuntu/Makefile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ubuntu/Makefile