Better OOP and display parameter
formating
update
Merge origin/master

Conflicts:
	dev/ideas
Merge origin/master

Conflicts:
	dev/ideas