Merge branch 'master' into daniel-branch
update specification files
Add flux ratio constraints.
Merge branch 'daniel-branch'