Update
Merge remote-tracking branch 'upstream/master'
Fix
Fix
Merge pull request #28 from P4V4/master

Fixes