Pull Request #37 (had to do it manually)