Mostly documentation
Merge pull request #7 from jayemerson/master-working

Mostly documentation