fixes #6
Merge pull request #7 from Trii/feature-123

fixes #6