added support for circus
Merge pull request #30 from marconi/master

Support for circus