Merge pull request #124 from cezarsa/withzone