Added feature updates and tests
Merge pull request #43 from tkjaergaard/enhancement/disable-return-and-toolbar-on-elements

Added feature updates and tests #41