Merge pull request #8 from zimmerst/master

new merge request