Fixes #184 . Before submitting the PR make sure the following are checked: Wrote good commit messages. Commit message starts with [Fix #issue-number] (if the related issue exists). Feature bra...