Merge remote-tracking branch 'refs/remotes/sneha/develop' into develop

This closes #67