bug with matching fixed
removed success sequence for now
Merge pull request #3 from shidel-dev/refactor

Refactor