add --pid_file command line option
resolve merge conflicts from luniki master. closes #95