merge changes from pdf417-dev branch