Updated stuff.
Merge pull request #1 from Giinger/Marinatedd

Updated stuff.
Merge pull request #3 from Giinger/master

work