Fixed issue 2 mentioned by Pawel

Not tested yet!