Refs #144 - Rebase the code on top of current circus master.
merge natim