Added @shivamparikh, closes #54