Merge pull request #3166 from techee/ada_parser