cpsievert Merge pull request #19 from muschellij2/master