modified functionalities
Merge branch 'master' of github.com:rougin/slytherin-php