Merge pull request #30 from nairys/feedback

Feedback & tags
deleted broken test
Merge branch 'master' into feedback