Merge pull request #49 from kreczko/master

QCD cross checks and some minor fixes