MattMoveFix: Merged fix.
Merge pull request #28 from jarradm/MattMoveFix

MattMoveFix: Merged fix.