Merge pull request #10 from Protobile/barcelona

Merge barcelona into dev