Makefile.am added
Merge branch 'mesuretool'