Merge pull request #49 from radarsat1/automake