Merge pull request #4 from JD99/feature

Feature