Added test GUI, basic query code + fixes
Merge pull request #1 from Sixsmorphugus/master

Added test GUI, basic query code + fixes