Fixing errors on params
Merge branch 'master' of github.com:Heavyblade/cirrus
Fixing errors on rendering