Kate Compton Merge pull request #8 from dariusk/patch-2