bug fix
Merge pull request #50 from Xzed93/master

bug fix