minor changes in comments and member handling
merging techdivision
resolving conflicts
Merge pull request #4 from wick-ed/master

minor changes in comments and member handling