Merge pull request #19 from foobar2019/master