First simple user defined queries.

Update #10
Little Cleanup and bundle files.