Final Code for submission :)
Merge pull request #15 from JKinsman/jk_fix_ql_v2

Final Code for submission :)