Pete's changes
Merge pull request #1 from zzz711/master

Pete's changes