add circus support
Merge pull request #292 from andrewsmedina/master

circus support