Latest version from the Marketplace. Added OM support. Some clean-up.
Deleted unneeded files.