Fixed src/Makefine.am
Merge branch 'devel'