Bugfix and a proper pull request