Fixes #28, fixes #38 and fixes #40
Merge pull request #49 from logomaster256/master

Fixes #28, fixes #38 and fixes #40