updating to latest stuff
Merge pull request #1 from HenrikJoreteg/master

updating to latest stuff