Merge branch 'sp/make'