pull request on dec 30

Michael,

Please have a look at it.