Merge pull request #1 from jsinge97/master

qee