fix 1.8 support. Update CalabashScript