issue-6: Replaced optional unwrapping with safer version using '?' to prevent runtime exceptions.
Merge pull request #13 from StreamSH/issue-6

issue-6: Replaced optional unwrapping with safer version using '?' to pr...