Imported Arthur Ketels' SOES (hg: ea7f05102d58)
Merge pull request #1 from mheden/master

Imported Arthur Ketels' SOES (hgid: ea7f05102d58)