Modifications to be OS X friendly.
Merge branch 'master' of https://github.com/godswearhats/pk