Fixing issue #3 of the main project.
Merge pull request #23 from mike-perdide/issue-3

Fixing issue #3 of the main project.