Merge pull request #1 from katsuobushiFPGA/master

Merge