Merge pull request #307 from kamicane/master