dreadatour Merge pull request #25 from mkolchin/patch-2