Fixed some usage prints
Merge branch 'master' into marc
merge backup
Merge branch 'master' into marc
Merge branch 'master' into marc
Development backup
Merge branch 'master' into marc
Got dammit C...