Merge pull request #60 from paweldudek/master

Fixed (hopefully last) c&p fail
Changed TDD to BDD, double TDD doesn't really make sense ;)