clarified, improved, etc.
also: http://whatthecommit.com/e48d3204f722719527a8c37f3543a8e2