Minor changes.
Merge pull request #46 from puneet/constraints-dev

Minor changes.