Merge pull request #661 from inc0/blade

I have no idea how I could miss it....
Merge branch 'master' into p2000
cr corrections