Try with better criteria
Merge branch 'master' of github.com:nmohr/ethpxar

Conflicts:
	python/trim.py
Merge branch 'master' of github.com:nmohr/ethpxar