Berlin branch
Merge pull request #16 from igorw/berlin2

Berlin branch