p2000 plugin
pep8
Merge branch 'master' into p2000
plugins option for scan
plugins option for scan
cr corrections
bugfix
merge
Merge pull request #665 from inc0/p2000

p2000 plugin
problems with collation
bugfix with api
Merge pull request #669 from inc0/api

bugfix with api
Merge pull request #668 from inc0/collate

problems with collation
Merge pull request #666 from inc0/plugins

plugins options