Updating fork

Pulling latest commits after fork