Merge pull request #1 from squix78/master

Merging from origin to fork