Fixes #80, fixes #355, fixes #258
Merge pull request #395 from logomaster256/master

Fixes #80, fixes #355, fixes #258