Merge pull request #110 from BluWings/master

minor code cleanup
#98 added plugin mechanism for query languages