fix submodule url
fix Makefiles
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from devernay/master

fix Makefiles