bugfix #8
Merge pull request #9 from daitel/bug_8_daitel

bugfix #8