resident controller and testing
Merge pull request #7 from mplaza/melabranch

resident controller and testing