Merge pull request #1 from AubG/master

Update from master
Merge pull request #17 from ghostsnstuff/master

Merge pull request #1 from AubG/master