Merge changes by James Ward
Merge branch 'master' of https://github.com/cowwoc/prefixfree