Added toggling support to the edition tools.
Merge pull request #84 from luisromangz/8.5-SNAPSHOT

Added toggling support to the edition tools.