Added Makefile
Merge branch 'stable'