Merge pull request #2 from ksliker89/master

Update my fork with changes