Merge pull request #1 from franklyfeathered/master

Master