sorting out the client...
Merge branch 'master' of github.com:ctanis/datafps