Fixed bug #40
Merge pull request #17 from GonzoGhanem/bug_fix_40

Fixed bug #40