Merge pull request #1 from alpha-ninja/patch-1