Merge branch 'plugins' into disks
small bugfixes
cr corrections
cr
Merge pull request #693 from inc0/bfix

bugfixes - reopened PR