Merge branch 'heads/sneha/develop' into develop

This closes #58