Araq/Nimrod — pull request #1257 by flaviut (2014-06-08 23:43:58+00:00)
Title: Fix bug in previous PR

Grammar changed slightly, also regenerated docs.