Fixes #35 in quickstart
Part of issue #35