Merge pull request #273 from joncham/bug-getpid