Merge pull request #26 from Dithermaster/issue_25

Fix issue #25