Merge pull request #21 from am11/master

Performance improvements
Merge branch 'master' of https://github.com/madskristensen/zencoding