Merge branch 'import' into phemmer

* import:
  add support for %import directives