Fixed src/Makefile.am
Merge branch 'devel'