Merge pull request #4 from tadl/master