Merge pull request #3 from paulkarabilo/master

client side ready to roll