Merge pull request #99 from madepeople/master

SVEA-32