Merge pull request #3 from Ocassio/master