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

Minor changes.