Merge pull request #111 from mottosso/master

Implemented #95
Updated API documentation and optional plug-ins (#92) implemented.