Fix #306
Merge pull request #307 from javierav/berlin

Fix #306