Updated to fix issue with multiple show/hides on the one event
Merge branch 'fix-show-hide-issue'