add waitForCompletion, revert to Java 1.6 (from 1.7)