Minor update
Minor update for the Issue #2
Minor fix related to the Issue #2