Beta 7

Fixed errors