Fork update

Updating fork to latest development build