copy from skelton
Merge pull request #25 from wcaplinger/master

William Caplinger