Switched to updated Make module

Using Clang static analyzer now
Merge branch 'hotfix/1.3.1'