Fixed issue #24
Merge pull request #25 from purpleplatypus/issue24

Fixed issue #24