added support for an analysis module configuration + minor bugfixes
Merge pull request #1 from wick-ed/master

added support for an analysis module configuration + minor bugfixes