Merge pull request #59 from kobliha/Code-11-SP3

Already approved into master