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

This closes #64