Merge pull request #108 from joshtriplett/freebsd