A little cleanup and notification to the user what's going on.
Merge branch 'master' of github.com:dpinney/omf