Merge pull request #64 from mchf/Code-11-SP3

already merged in Code-11-SP2