Merge pull request #1 from qmar/master

Fixes
Fix