Merge in pull request !10 from @vkaldi. Fixes #9