Removed coverage from requirements
Better constraint handling
Merge branch 'master' into doc