Merge pull request #2 from Ocassio/master

Logic