Merge remote-tracking branch 'sneha/2476' into develop

This closes #60