FuriouZz Merge pull request #9 from FuriouZz/master