Add self documented comments - ready for version 1.0.1