Not real changes but commiting so I can be done with this branch
Merge pull request #509 from stowellm/ms485

Not real changes but commiting so I can be done with this branch