Abinash newchanges

A takeover of #129 after resolving the merge conflicts