Merge pull request #1046 from colemanw/showHide