Commit 249537573b8509fc8ed0ae8e51835d084af7c3d2

Arthur Schreiber 2014-01-14T19:08:58

Incorporate @arrbee's suggestions.