Adding new feature
Merge branch 'feature/new-feature'

Closes #1