#89 - Updated for @tuscland pull request.