Added some logic
Merge branch 'master' of github.com:bararchy/WTP