Fixed bugs, Updated to V0.7, Thanks to bilbao