Syncing fork

To keep current fork up-to-date with the upstream repository