Issue #19

Fixed Issue#19
Forgot to pull request days ago.