1.0.7 Beta3

Some bug fix