Vandenn/ConyoPlusPlus — pull request #4 by yaojohnpaul (2014-10-24 04:16:36+00:00)
Title: Merge pull request #3 from Vandenn/master

Merge