Merge pull request #11 from tiarebalbi/staging

Staging
[bamboo] Automated branch merge (from staging:013b77bac488bafac6495d2748dfc06f344a1b4d)