more changes to control class
Merge pull request #2 from troyclose/master

more changes to control class