Update for automake 1.13
Merge pull request #25 from dmashal/master

Update for new automake