Merge pull request #1 from Dhole/master

latest stuff from Dhole's chandler