Merge pull request #21 from atomfrede/master

Updated zxing to latest version