Problem: We didn't have a simple solution for the RFC.
Solution: Implement clean and easy solution for both the client and server.
Merge pull request #16 from johnvanloon/master

Simple solution for the RFC.
merge
FIXES #14