Merge pull request #377 from syncfusion/paulandersons/psychic-chainsaw