docs and style
Merge pull request #1 from danasf/master

docs and style