Fixed #41.
Merge pull request #42 from panter-dsd/fix/issues/41

Fixed #41.