New Version,fixes #1 (null room bug)