Merged pull request from alexi sholik and updated contributors