Merge pull request #1 from rosarior/master

try merge upstream to my fork