Merge pull request #2 from ksliker89/master

Update my fork with changes
Merge pull request #2 from s3c4nt/master

Merge pull request #2 from ksliker89/master