Issue #56

.
Logic incorporated

.
Commenting
Updates

.