Updated to version 1.9 + fixed some errors