Fix Issue #18
Merge pull request #19 from gdumitrescu/bug_18

Fix Issue #18