Significant fixes.
Comment updated.
Merge pull request #1 from BoardTools/fix/1

Significant fixes.