Merge branch 'issue76'
updated query for smoother toggle function #76