Fixes
Merge pull request #1 from knownasilya/fixes

Fixes