Merge pull request #3 from andreasvc/master

Add macro support.
Cleanups.
Apply macros to marker queries.
Add write support for dact & compact corpora.