Merge pull request #3 from gidzzz/dev

Dev
Fixed Dev-iations. ;)
Merge pull request #4 from gidzzz/master

fix