Feature/make check