Merge pull request #4 from shantanud/2.1

Implementation changes to support Function and Action execution for diff...
Merge remote-tracking branch 'upstream/2.1' into 2.1