Merge pull request #1 from DoctorWhooves/master

1
Merge pull request #2 from DoctorWhooves/dev

Merge pull request #1 from DoctorWhooves/master