Merge pull request #1 from JosephCarrington/master

Added from master