Fixes + Update
Merge pull request #95 from P4V4/master

Fixes + Update