merge correction, bug fixes, added web service plugin example