dave's changes over 13/14 break
Merge pull request #15 from wolberd/dec10changes

dave's changes over 13/14 break