Memory leak #49 and maxonscreen bug #98 fixed