Merge pull request #20 from cstamas/parent-35

Update ASF parent to 35