Merge pull request #1 from ksliker89/master

Updating my fork
Merge pull request #1 from s3c4nt/master

Merge pull request #1 from ksliker89/master