Christian - 2013-04-02

Some bugfixes and method to free up allocated space