Proposal from Julius Manni
Merge pull request #1338 from stude1/master

Proposal from Julius Manni for Helsinki 2014