Merge pull request #362 from hbogner/master