merge pull request #1 from lubecjac/master