Issue-15 : Fix #15
Merge pull request #17 from fjbelchi/Issue-15

Issue-15 : Fix #15