Issue #45. Branch Iss#45. Update: Removed redundant lines