Fixed stuff
Merge pull request #1 from economicmodeling/fix_make

Fixed stuff