Merge pull request #1 from maxpk93/master

Test merge
Merge pull request #2 from felixpk/master

Merge pull request #1 from maxpk93/master