fixed bug 6
Merge pull request #18 from afreel/master

Fixed Bug #6