Updated s.t. it works
Merge pull request #1 from davsebamse/master

Updated s.t. it works