Includes: * https://github.com/witchcrafters/quark/pull/36 (changes merged separately) * https://github.com/witchcrafters/quark/pull/37 * https://github.com/witchcrafters/quark/pull/38