Merge pull request #48 from tribal-tec/master

The real Bamboo fix
Use correct master node for mapping objects