Fixed Makefile.
Merge branch 'feature/tests' into fix/array-issue