import refactor 1.0
fully implement query import
Merge pull request #16 from mejas/master

with import