Merge pull request #390 from syncfusion/paulandersons/cuddly-eureka