Quick bamboo updates
Merge pull request #37 from chylex/master

Quick bamboo updates