fixed Bug 7
Merge pull request #23 from SuperDudo/master

Fixed #7