Closes #210, fix name for Sharna