renamed to parent
Merge branch 'master' of https://github.com/ivanceras/parent