Merge pull request #53 from heil/prosody