better documentation
minor change in comments
Merge pull request #3 from jabiru/dev

Dev