fixed bugs
added Makefile.am