Bug fixes
Merge pull request #1 from jonasgraudums/master

Bug fixes