Added option for parent id only
Merge remote-tracking branch 'graza/gh-pages' into gh-pages