added slug behavior
Merge branch 'master' of https://github.com/legiov/test