bronze - 285 set up
Merge pull request #329 from gsn/master

bronze - 285 set up