Huge update
Fix
Fix
Fix
Dead
Merge pull request #17 from jutozex/master

Huge update