Merge pull request #188 from vaites/zbar