add optional hostname and pid components
Merge pull request #12 from codekitchen/master

add optional hostname and PID components