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

bronze - 285 set up