Merge pull request #2 from ksoona/master

Documentation
Merge pull request #11 from thomhastings/master

Merge pull request #2 from ksoona/master