#58 and #59 are different pulls that include this due to merge conflicts, unrelated otherwise. Or do you want me to squash them into one pull request? (people usually prefer to keep them atomic and easy to merge)