Merge pull request #23 from preset-io/srini/mar22021

upto date as of commit b87f97b852405199a661266596c83b5798b677bc from …