dMerge pull request #3 from jayhawks/master

fg