YEah i reworked
Merge pull request #1 from Matrox1/master

YEah i reworked