Merge pull request #2 from KoffeinFlummi/master

Update
Merge pull request #123 from ACCtomeek/master

Update