Mantis 6190: More advanced version by frank_jepsen
Mantis 6182: Better drawing