Pulling latest changes from master into RGraph

For attempt to integrate database