Hotfix
Refactoring and feature addition
Merge branch 'feature1'
Fixes #2 by adding some words