@mikeryan: While you're at it, will you fix #12? :)