emp
fix bug in parent() function
Merge branch 'bug'