DBoo/fix8 — pull request #10 by DBoo (2014-06-03 03:32:22+00:00)
Title: Dev

Sync to get Sergey's latest changes