Merge branches
Adding the ability to make an instance of Mousetrap fire on all controls.