Fixes #283

Before submitting your Pull Request (PR), please check the following:

• There is no other PR (open or closed) similar to yours. If there is, please first discuss over there.
• Your new code in each file follows the same style as the existing code in that file.
• Each commit messages follows the Seven Rules of a Great Commit Message.
• Each commit message includes Fixes #<bug> or Resolves #<issue> in its body (not subject, that is, the
  first line) for each issue it resolves (if any).
• You have squashed any redundant or insignificant commits.