Araq/Nimrod — pull request #1279 by Varriount (2014-06-16 00:16:29+00:00)
Title: Fix issue #1216

Fixed #1216