Fixes for todos.
Merge branch 'master' of github.com:SimpleUpdates/SUPackageMEU