Issue #10 update plugins

This merge addresses issue#10