QuickFix #40

Yay #40 QuickFix!