Merge pull request #1 from dsaber/master

Dan Saber project pull request