Even more work
Merge pull request #1 from niclasforsell/dev

Even more work to PROD