Merge pull request #1 from harrisonpartch/master

update from original