@wasade, I realize it might be late now, but would you mind making these comments on #235? @squirrelo issued the PR with my changes merged in but since the other PR hasn't been reviewed, nor merged they show as part of this change set.