Merge pull request #225 from vlsi/master