(TTA) Fix and clean
Merge branch 'master' of ssh://github.com/orcc/orcc