Merge.
Merge branch 'master' of github.com:lmjohns3/py-whiten