Updated documentation
Merge pull request #2 from cispy/master

Merging test