Merge pull request #1 from jpetey88/master

Update from original