Merge pull request #46 from lategoodbye/master

experimental feature application reset, better primary scan, equalize stderr output