some comments, slight refactoring
Merge pull request #107 from fleur/master

some comments, slight refactoring