diamond 1.9 ready

standby for merging hello & world