Merge pull request #34 from nolanfilter/Nolan

Fixed MessageObjectController