Merge pull request #9 from lha/master