Some refactor on client side
Merge pull request #48 from pnagy/master

Some refactor on client side