added client side functionality
Merge branch 'master' of https://github.com/putnik13/AVP
small fix