Fixed issue #10, Makefile updated