Implented issue #48.
Merge.
Comments clean-up.