Issue36

Not tested, I am in a hurry :)

Fixes #36