Working

Updating master version to latest working version which includes changes made to rjs80 master