make nice
Merge origin/master

Conflicts:
	Makefile