Add PHPUnit tests
Minor changes in doc blocks
Merge pull request #1 from wagnert/master

Add PHPUnit tests