Merge pull request #1 from johanhakans/master

a lot of small things