Merge pull request #10 from Psylynce/master

Merge from master
Merge pull request #11 from Psylynce/Justin_Work

Merge pull request #10 from Psylynce/master