Implemented sollution as found in issue #13
Merge pull request #20 from rejhgadellaa/master

Implemented solution as found in issue #13