Merge pull request #1 from grayfuse/master

merging other branch