Adding a compact mode (fixes #18)