Merge pull request #5 from metaborg/unstable

v0.2.1