Added on-demand plugins support. #534
Merge pull request #539 from rejdi/ondemand-plugins

Added on-demand plugins support. #534