Eman's various remix

It's a mixture of PR  #1017 and some additions / changes.. Would have send the PR to @emanuele45 but don't know how :P