Merge pull request #1 from shongo/devel

Merge devel to master