Merge pull request #763 from lexware/master

Quick cleanup