Merge pull request #2 from ci-bonfire/master

Master