fixed bug#26
Fixed Issue #26
Merge pull request #27 from sexnothing/master

Fixed Issue #26