premature commit.... :(
Merge branch 'master' of github.com:d60/Cirqus