Merge pull request #94 from EDiLD/fix_quick

Fix for Issue #93