Minor QSTools update and cleanup
Merge pull request #1 from rafabene/master

Minor QSTools update and cleanup