Merge pull request #482 from jkominek/master