Merge pull request #96 from benbjohnson/unstable

Fix factor key space.