Issue #13 - Fix pull request