Added 0.1.1, some fixes