latest changes
Merge branch 'clq-simple' of github.com:cyrus-/ace into clq-simple