Merge pull request #47 from mklein994/master