Merge pull request #36 from ggtools:patch-2