Updates for filtering and retries when errors occur.
Merge branch 'master' of https://github.com/slide/cp2gh