fixes
Merge pull request #1 from Dramacydal/master

fixes