small changes and more inline comments
Merge pull request #37 from Atheros1/master

Small changes and more inline comments