Added main() method and updated Makefile