Updates and better documentation
Merge pull request #2 from rspieldenner/improvements

Updates and better documentation