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

This closes #63