Incorporate changes from Josh's PR

https://github.com/kamrik/for_review/pull/1