added more generic quality control
Merge branch 'master' of https://github.com/d-m/bmorehackathon2014