Addition for issue #2.
Merge pull request #8 from ldionmarcil/master

Addition for issue #2.