junruidi Merge pull request #2 from muschellij2/master