Simplyfing Makefile.am instructions, resolves #10