Merge pull request #1 from sharpa/master

Additional tests and documentation