Fixes #62
Merge branch 'develop' into ready-for-production
Merge pull request #72 from theponti/ready-for-production

Fixes #62