Merge pull request #1 from wklken/master

none