Fixes for new update
Revert "Fixes for new update"

This reverts commit bad15abfa699851c29ab046e189130bc422297e5.
Merge pull request #8 from TheKins/master

Update fork with upstream commits