Fixing constraint errors
Merge branch 'master' of github.com:mikekvintus/aha