Merge pull request #1 from TheKins/master

Update fork with upstream commits