Major Update 0.3.5.4