Merge pull request #20 from pyr/ss/graphite