mdlincoln Merge pull request #3 from petermeissner/patch-1