Merge pull request #414 from kri5/master