Merge pull request #372 from syncfusion/paulandersons/ideal-waffle