changes
Merge pull request #2 from z4w3p/master

Merge PR #2