Fixes
Fixes
Merge pull request #338 from lDiverse/master

Fixes