Update 6.0.0 branch with lsof change
Merge pull request #15 from mdrillin/6.0.0

Update 6.0.0 branch with lsof change