This is the latest working edition. Fixed the bug I found after last com...

...mit.