Merge pull request #3 from felixpk/master

Merge pull request #2 from maxpk93/master