Memory Management

Hi Andreas,

I just discovered some memory issues on the current 2.0b1 version. I hope I did the fix the way you would have done it... :)

Greetings,
Michael