Merge pull request #20 from ellina-s/arjan

Arjan