Pushed to 1.1, fixed setup bug