Merge pull request #72 from rterbush/2-0-stable

Fix this thinko..