Jaide's update
Merge pull request #3 from carlieh/master

Please sir accept this request
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from JaideHaynes/master

take it and go