Merge pull request #10 from Protobile/barcelona

Merge barcelona into dev
Merge pull request #11 from Protobile/development

Merge pull request #10 from Protobile/barcelona