Merged in pull request #34 from tricinel.