Commit ac44b3d2447f06f4022bb4b58a160244e24c039c

Arthur Schreiber 2014-01-13T23:28:03

Incorporate @ethomson's suggestions.