Added other part of pull request #72

  Sorry guys, forgot about this :)