Closes #42 (closed)
@a-roehler What do you think about this? It seems to work for me, but is it complete?