Version updated to 0.9.9 and added some fixes